From: popcornmix <popcornmix@gmail.com>
Date: Wed, 19 Apr 2017 14:10:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'stable/linux-4.9.y' into rpi-4.9.y
X-Git-Tag: archive/raspbian/4.9.30-2+deb9u2+rpi1~5^2~121
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=53460a0a50f3dd5e60266e945d0ac794ce0eca77;p=linux-4.9.git

Merge remote-tracking branch 'stable/linux-4.9.y' into rpi-4.9.y
---

53460a0a50f3dd5e60266e945d0ac794ce0eca77
diff --cc drivers/i2c/busses/i2c-bcm2835.c
index 8642f580ce41,f283b714aa79..47167f403cc8
--- a/drivers/i2c/busses/i2c-bcm2835.c
+++ b/drivers/i2c/busses/i2c-bcm2835.c
@@@ -279,7 -128,7 +279,9 @@@ static irqreturn_t bcm2835_i2c_isr(int 
  	}
  
  	if (val & BCM2835_I2C_S_DONE) {
--		if (i2c_dev->curr_msg->flags & I2C_M_RD) {
++		if (!i2c_dev->curr_msg) {
++			dev_err(i2c_dev->dev, "Got unexpected interrupt (from firmware?)\n");
++		} else if (i2c_dev->curr_msg->flags & I2C_M_RD) {
  			bcm2835_drain_rxfifo(i2c_dev);
  			val = bcm2835_i2c_readl(i2c_dev, BCM2835_I2C_S);
  		}